Cause GETTEXT_PACKAGE to be consistent in config.h and po/Makefile, was

2000-07-26  Robert Brady  <rwb197@zepler.org>

        * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h
          and po/Makefile, was installing and looking for them under gtk20
          and gtk2 respectively.

diff --git a/ChangeLog b/ChangeLog
index 834ef6b06afa477251f8827840094da596948c8e..62e9630f5dc350934715f57759397269167eee0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-26  Robert Brady  <rwb197@zepler.org>
+
+       * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h
+         and po/Makefile, was installing and looking for them under gtk20
+         and gtk2 respectively.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/testtext.c: Comment out some stuff that depends on the rest
@@ -104,6 +110,7 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
+>>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 834ef6b06afa477251f8827840094da596948c8e..62e9630f5dc350934715f57759397269167eee0f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2000-07-26  Robert Brady  <rwb197@zepler.org>
+
+       * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h
+         and po/Makefile, was installing and looking for them under gtk20
+         and gtk2 respectively.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/testtext.c: Comment out some stuff that depends on the rest
@@ -104,6 +110,7 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
+>>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 834ef6b06afa477251f8827840094da596948c8e..62e9630f5dc350934715f57759397269167eee0f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2000-07-26  Robert Brady  <rwb197@zepler.org>
+
+       * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h
+         and po/Makefile, was installing and looking for them under gtk20
+         and gtk2 respectively.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/testtext.c: Comment out some stuff that depends on the rest
@@ -104,6 +110,7 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
+>>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 834ef6b06afa477251f8827840094da596948c8e..62e9630f5dc350934715f57759397269167eee0f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2000-07-26  Robert Brady  <rwb197@zepler.org>
+
+       * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h
+         and po/Makefile, was installing and looking for them under gtk20
+         and gtk2 respectively.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/testtext.c: Comment out some stuff that depends on the rest
@@ -104,6 +110,7 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
+>>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 834ef6b06afa477251f8827840094da596948c8e..62e9630f5dc350934715f57759397269167eee0f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2000-07-26  Robert Brady  <rwb197@zepler.org>
+
+       * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h
+         and po/Makefile, was installing and looking for them under gtk20
+         and gtk2 respectively.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/testtext.c: Comment out some stuff that depends on the rest
@@ -104,6 +110,7 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
+>>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 834ef6b06afa477251f8827840094da596948c8e..62e9630f5dc350934715f57759397269167eee0f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2000-07-26  Robert Brady  <rwb197@zepler.org>
+
+       * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h
+         and po/Makefile, was installing and looking for them under gtk20
+         and gtk2 respectively.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/testtext.c: Comment out some stuff that depends on the rest
@@ -104,6 +110,7 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
+>>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 834ef6b06afa477251f8827840094da596948c8e..62e9630f5dc350934715f57759397269167eee0f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2000-07-26  Robert Brady  <rwb197@zepler.org>
+
+       * configure.in: Cause GETTEXT_PACKAGE to be consistent in config.h
+         and po/Makefile, was installing and looking for them under gtk20
+         and gtk2 respectively.
+
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
        * gtk/testtext.c: Comment out some stuff that depends on the rest
@@ -104,6 +110,7 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
+>>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/configure.in b/configure.in
index f802b4a7d809734286461b5df9c1eda9b53b9ac0..da136a3c35e847ff45e0d0a26edf503de6101604 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -72,7 +72,7 @@ PACKAGE=gtk+
 
 GETTEXT_PACKAGE=gtk20
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"gtk2")
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}